If the window is maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)

2003-11-15  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
	maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)

diff --git a/ChangeLog b/ChangeLog
index 93916b63f6145e6d324f2e681796eb7003e8fc03..9e317654c2db2cfad9e58e043f4e5e46996695d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
+       maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)
+
 Thu Nov 13 12:55:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update the rest of Section 2

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 93916b63f6145e6d324f2e681796eb7003e8fc03..9e317654c2db2cfad9e58e043f4e5e46996695d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
+       maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)
+
 Thu Nov 13 12:55:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update the rest of Section 2

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 93916b63f6145e6d324f2e681796eb7003e8fc03..9e317654c2db2cfad9e58e043f4e5e46996695d9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
+       maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)
+
 Thu Nov 13 12:55:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update the rest of Section 2

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 93916b63f6145e6d324f2e681796eb7003e8fc03..9e317654c2db2cfad9e58e043f4e5e46996695d9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
+       maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)
+
 Thu Nov 13 12:55:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update the rest of Section 2

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 93916b63f6145e6d324f2e681796eb7003e8fc03..9e317654c2db2cfad9e58e043f4e5e46996695d9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-11-15  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkwindow-win32.c (gdk_window_focus): If the window is
+       maximized, use SW_SHOWMAXIMIZED. (#126986, John Ehresman)
+
 Thu Nov 13 12:55:29 GMT 2003  Tony Gale <gale@gtk.org>
 
        * docs/faq/gtk-faq.sgml: Update the rest of Section 2

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 78ba30530931592167549c928f1bcce77be06976..6651e54664536d9e2ae5056a05486f1ab44cd96e 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -2715,7 +2715,10 @@ gdk_window_focus (GdkWindow *window,
                           GDK_WINDOW_HWND (window),
                           _gdk_win32_window_state_to_string (((GdkWindowObject *) window)->state)));
 
-  ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
+  if (((GdkWindowObject *) window)->state & GDK_WINDOW_STATE_MAXIMIZED)
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWMAXIMIZED);
+  else
+    ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
   SetFocus (GDK_WINDOW_HWND (window));
 }